Surface level edits to help usability