Reformat code, remove not needed lines