Visual changes and code cleanup