Updated name and some structure of the code