Some cleanup and visual changes