Add short var clipping

Clipping for short variable declaration:

    i := 10
Update clipping indents
Fix function matching for pointer return types