Adapted to styleguide and improved grammar