Cleanup and conformizing