Some cleanup
Add a short description