Code Cleanup

Cleanup up lines with just semicolons.  Fix bug in function translating
code.