Cleanup & Rubocop bug fixes.