Cleaning code

re-indenting, removing unnecessary whitespace, increasing string
processing efficiency