Some cleanup
A bit of documentation