Code cleanup
Experimenting with second start