applied editor's changes