Fix bug and format code