Updating comments and some formatting.