Cleaned up the initialization method.
Merge pull request #32 from ajdawson/init-cleanup

Cleaned up the initialization method.