cleaned the previous commit up a little