Cleaned up the templated. Report in tabular form