Removed license header
Simplified the templates
Forgot static keyword