some style, some comments, some consistency