Added slight randomness and organized(ish)
Merge pull request #1 from Plazmaz/patch-1

Add Plazmaz's changes so it's cleaner and more intuitive. TODO: Add moar randomness