[TASK] Fixed scrutinizer issues - closes #45