Add commets, cleanup etc.