refactoring... making some changes