fix whitespace and cleanup