Get rid of some commented out code
Perltidy
Don't return `$self` where it is not needed or put an explicit `return`
Remove commented code