Update Express
Refactor report