refactor, minor turning