cleaned up errthing