Make everything faster and nicer.

Signed-off-by: Peter Atashian <retep998@gmail.com>
Merge pull request #1 from retep998/master

Performance improvements coupled with code simplification.