Refactoring, clean up.