Refactored whitespace in models
Once again ignoring adjustments