Remove extra whitespace
fix code structure and formatting