Refactors to prevent errant key enters