Refactoring
Using ZeroBrane's "inherits" feature to get rid of redundancies
Version 2.1