Use entity for version - not hardceded. Small reformat