Cleaned a code little bit