Dirk point ctrl minor refactoring