Reduce complexity #56
Description
Fix some complexity issues reported by scrutinizer: https://scrutinizer-ci.com/g/rickard2/utcw/code-structure/
{{ message }}
Fix some complexity issues reported by scrutinizer: https://scrutinizer-ci.com/g/rickard2/utcw/code-structure/