Yet another part of refactoring done