remove duplication of processing
fix review comments