Little update
Upgrade and cleanup