Initial code changes

Removing extraneous code and simplifying object structure.