cleaning up - refactoring