Congress: clean up code