Aaron's Code review

Code review done by Aaron