- simplified the code handling bfc statements a bit