Cleaned up input conditional