Remove deprecated properties
Fix indentation