clean up
adding in some options