Cleaned up semicolons and paren spacing