cleaning
some changes; adding style