Reworked the whitespace busters classes