Cleaned some of the codes