Fixed formatting, still have bug