More comments and formatting. Woo!