Cleaned a bit the code