Comment And cleanup part 2