Rename key, remove comments