@= refactored go templates