Clean up

code maintenance