Follow more mako guideline