Cleaned some code convert