Clean Some code