Cleaned up the model and controller login in step 5