Project 2 -- Refined formatting