Cleanups + dep on pry-fkeys