Implement suggestions from theo.