refactoring, cleaning up.