Reformatting + Improving if statements handle