improved docs and properties' names