Cleaned up ouput template