Code Clean up.