FIX: Make close key check a method