Fixes for comments and formatting.