Moved else if to function, fixed bool start