Removed redundant functions
Clean-up and integration
Took Scott's changes and cleanly integrated them in with the existing structure.