Cleaned up main.rs