Reduced cyclomatic complexity

Fix for broken build :]