programming: Improve definitions