Moar Input cleanup