formatting, more if else statements