idiomacy pass - continued

I'd like to see all these moved to properties in the method file and referenced via self throughout.