Refatoring

Step -> rest