Refactoring a few methods to slim down some methods