Edited comments and style