Update: fixing formatting issues