clean up and visual improvements