Working on some code clean up

Includes updated formatting and code documentation