Cleanup function comments