Refactoring methods, working on making API more consistent