Cleanup & comment