Fixed missing <cfelseif

Also removed whitespace and cleaned up indentation