Remove duplications of code (properties)
Small improvements