Mainly visual changes and code cleanup