improvements
tidy up final set of code formatting