adding comments and some style