Bring code to general style