cleanup, little bit of style lovin