Misc style fixes for DEVELOPER-296 DEVELOPER-457 DEVELOPER-453