linting; shortened lines; replaced register_actions for local solution