Fixed formatting
reorganization
New template helper