Code and Model Cleanup