Correct various syntax issues / simply code.