Improve logging
Improve order of processes and simplify adding new steps