completed all exercises successfully
minor clean up of some methods