Remove else
Merge and fix whitespace