fixed problems with coding conventions