Some cleanup
Merge pull request #1 from Crystals/b1

Some cleanup