More cleanup before changing logic
Output formatting. Commiting since I wont be touching this for a little while