cleaned up and refactored a few models