cleanin up fn.command
cleaning up
tempaltes as constants