Cleaned up some code / whitespace issues