Refactor main loop + Managed options that don't need package name