Added/changed comments and style