cleaned up a  little