cleans up single key action logic
general cleanup