THe code was cleaned a bit