Fixed more codeclimate issues.