renamed model and cleaned up comments