Code cleaning and reasonable centering