final code fix

clean up