New Commit

A bit of cleaning up. A few more updates coming soon.

Signed-off-by: aaruni96 <aaruni.kaushik@gmail.com>