Small refactors
More changes, and use to_s in many places