included review fixes(removing RefCell, using unwrap, handling port, suggested code changes)