wip
Simplifying template.
refactoring
Merge pull request #749 from edx/e0d/commoncluster

E0d/commoncluster