Fixes for warnings emitted by rubocop -s

Fixes some style complaints emitted by running rubocop -s