cleaned up some minor items