Finally fixing fomratting