Finished split-to-classes refactor and _toString() refactor