Cleaning code and adding simple functionnalities