usability changes, code cleanup