Fix attributes missing
Fix indentation