to_hash rework
attempt at better naming