cleaned up some mess :)