#: code cleanup