modul rewrite
#126
some cleanup