getting squeaky clean in Models