[BF] Fix bug and whitespace