Cleanups, conventions and formatting