First working version
Cleanup