Some cleanup and additions