Adjust code to style used in the codebase
Provide better error message for mix -e, closes #1639