Making some changes per rubocops request