Re-factor code.
Merge branch 'master' of https://github.com/butlermh/YahooHackDay2013