Formating and fix module export