clean style and files a little bit..