changed collection/layout class methods to be instance methods