Consolidated many methods into simpler ones