Fix multiple package issue, syntax errors, formatting and useless
comments.