DSA-33, code cleanup