Fixed ticket cell cleaning bug and refactored