stylistic updates to ensure code standards are the same in all files