refactor properties
reanme