Simplify resolve related stuff
Fix an error message
Whitespaces
Use asterisk instead of percent sign