Cleanup that makes code readable and removes things possibly.