Slightly refactor parser
Update modals