Implement suggestions by @CraigyDavi