Cleaned some codes