cleanup and making ? and ! at the end of identifiers not look like operators - and -> in type signature looks distinct