More function visual cleanup and comment blocks.