Feature/code cleanups

Minor changes, mostly stuff to make rubocop happy...