Formatting cleanups to the code