minor cleanup of main.rs