Merge "EditPage: Minor code style improvements"