Cleanup & comment 2/2