Refactored to have less "private" functions on prototype

Also fixed  “resolve” and “fulfill” term usage (hopefully)