Cleanup and changing loadModel to send string instead of map for model