Cleanup, house style
Set new state separately and change from format method to string interpolation, close #2
Refine instructions