Perform some small cleanups

Fixed some minor formatting issues and removed a commented out line of
code.