mod.rs cleanup and renaming
comments