id fix, formatting