Simplified models a bit and gave things clearer names