Just formatting and removes debug output and not used variables.