Removing comments!
Using the updated trait