refactoring methods to use passed in options