Simplified some of the methods