cleaned up models - closes #13