Cleaned a little bit the code