Refactor objects a little.