Add missing semicolons.
Start changing to OOP. Refactor, rename.