DRY'd up controller behavior; removed outdated specs