Cleanup doc annotations and variables names