Context: code cleanup