model architecture: better var names, better relations