Boolean and Rubocop fixes