fix duplication
fix code formatting