Add a comment
Sort into logical sections and clean up formatting