Else removed
Removed return
Renamed functions
Double quotes to single
Simplified resolve job