Refactoring all methods.