Refactor normal mode