Fix Y keymap + cleanup