Some refactoring is done