nice update, cleanup and streamlining