remove some redundant code, fix indentation