Some clean up on python-negar module