Simplify logic a bit for example.
Remove commented out lines.