clean up code to reduce warnings and errors.
Merge branch 'classes' of github.com:asaokamei/Models into classes