Tidy up and update to latest express