Trying to clean up before prettifying
first stage of code review
Merge branch 'feature/code_review' into develop