category: code improvements