A bit of cleanup and enhance documentation