clean up code and add some style