Post code review

Missing parts of code review because my eclipse broke.