Reformat module.exports
Merge branch 'feature/error' into develop