Some cleanup and better descriptions