a little refactoring
tried to fix conclude helper
rearranged conclude helpers