Cleaned up in model