[UPDATE] Strong typing and some coding standard