Conform to java conventions