Implement a convention for referring to this in traits
Code cleanup