Merge requested small style changes from base repo owner