Organized code for Strafunksi some more.