Cleanup, refactor