Code cleanup, blackPowder added