(#151) - promise code cleanup