Split overly long lines. Removed some comments & deadweight code.