Code clean

Big code clean with the help of @pdehaan ! :D