refactoring - spring cleaning!!