Only one class for representing registers
Minor changes