Small style cleanups / resolve rubocop warnings