Removed class >> self in favor of extend self which allowed to remove one level of indents