General update and cleanup

Feedback from Prof