* yet another code cleanup