Edited if, else and else to our conventions