Fixed whitespace issues and removed comments