kill some rubocop warnings
Fix more style bugs