cleaned upsome more stuff