refactor nave and main