Fix formatting
Rewrite scrambling
Merge pull request #1 from lol768/master

Fix formatting and rewrite word scrambling