Clean up/refactor