code/documentation cleanup