I will format more when working on #2