amended issues from Code Climate