Improve consistently of UI and source code.