add the verification ; change the code style