removed excessive modularization/separation of concerns for rover's mind