Update cleaning code and add express