Rubocop compliance
Bug revise