Clean up

Code maintenance