Some minor cleaning and commenting