Some more changes in refactoring