Update to have clean code for pyquest release