add some styling,test and cleanup