add properties save table removel after use
names refactoring and formatting cleanup