cleaned up method calls with extend self declaration