Comment and cleanup part 1