Cleanup from feature/refactor