Almost finished fixing the formatting.