Fixes to improve code documentation