rewrite propeties header
rewrite public/private headers
remove some redundant comments