Cleaned up handlebars template. Added test. Added some comments.