Minor cleanup to fix codacy / codeclimate issues