Some cleanup done of weird code.
Statementparser still allows for missing ;, can't seem to fix