Clean up

code cleaning