Fixed comments and coding