Code clean up and added BackboneJS