Getting rid of unnecesary condition and whitespacing