Refactoring to reduce complexity

A few methods were turning up as overly complex by `flog` so this uses the Extract Method to reduce the complexity of the functions in this module