Clean up controller further, add to chapter