Added storepoint helper methods and variable cleanup from copy/paste