Issue #9: fixing some missing semicolon and spaces