rubocop fixes
cleanup
kitchen cleanup