fixing redundancy in callbacks