Cleanup existing code to style.