Code clean up and problem with the model