previous commit works fine, so just a bit of cleanup