Refacotoring and one instance of s/implementation/definition