Ver 4.10

Clean up codes