decision/ code refactoring