Cleaned up some nasty whitespace and code: