enhancement: code cleanup