cleaning up and translating comments