minor cleanup part 1 + updated storageutils