cleaned things up a bit,

faster to use on new machines