remove unnecessary fileds, fix indentation