Add missed files

Use correct method

Implement review feedback

Add missing frozen_string_literal

Squash 5 commits