Finished steps refactioring and closed #2.