Cleanup-refactor