Few more refactoring