Some code refactoring held