Removed unused classes; added letter shuffling