* Cleaned some codes