Trait abstract methods
Clean up