some cleaning up

more tweaking with the view