code cleanup n refactoring