Simplifying class-internal calls
Added self as argument to object methods