fix whitespace issues, shortened options