more beautification edits