Added iron-router. Made code cleanup