Ran clean-up on the code

Author: lhunker