Cleaned up some model stuff