cleanup, visual improvements