Reworked controller input ifs