Module pyssy cleaned and refactored