Feedback ruond 4

Incorporating style fixes from Josh