Refactoring, cleaning up.