Code review by Rameen

Hey Kyle,

Reviewed your code and created this pull request so you can see the changes.  Let me know if you have any questions or comments!  Happy 2014!

-Rameen