Prepare for next iteration

I made a lot of small changes that will help me during the next few
iterations.