codestyling
declare property explicit
remove unused variable
Merge branch 'master' into fix_13