Fixed order of steps + cosmetic changes in logging