Cleaned up whitespace and comments