Clean up, refactor