remove unused field
fix indent