fix whitespace and fix '