some changes for java conventions