Resolved Code Climate issues