Some method refactoring..