tidy up codes
Merge branch 'semantics3' of github.com:herry13/sfp-scala into semantics3