Clean up & commenting for review

Clean up & commenting for review