Finished refactoring each method with passing tests