Code Clean Up

Comments and general clean up