Clean up

Comment add and basic clean up