removed a lot of verbosity
cleaned it up a lil