Code cleanup
Update Makefile.PL.
Remove Ouch, issue: #2.