Added new summary formatter and did some cleanup work