Design improvements
Fixed indentation