Finished converting to Bitset - Cleaned up stuff