Refactoring to simplify some methods