Minor cleanup and skeleton comments