use promise returned by evaluate instead of adding a callback.
fix whitespace, remove unused import