Created by: eesaanatluri
This PR is opened to accommodate any small misc. code cleanups
Merged by: rtripath89 at 2021-02-11 19:50:53 UTC