Refactoring to remove unnecessary complexity, large methods or looping