Move traits out of the method bodies