Refactor and adding of express