Fixed whitespace isssues