Clean up and refactor