Update/refactor Express