Move braces to previous line
Move "else if" to closing brace
More code cleanup