Refactor

Inserted comments from code review this morning