Some comments and formatting