Cleaned up start
Merge pull request #65 from sstewartgallus/refactored_start

Cleaned up start