Revamp java conventions