Code cleaning

 * Use '} else if {' instead of '} else { if {'