Implement suggestions in #6