Code clean up.
Code clean up, removed excess promise.
Commented.