cleaning up register class and added labels (for gotos)