Refactored utility code.
Merge pull request #4 from aleph2012/refactored-utilities

Refactored utility code.