cleaned up some small things