Cleanup code: step 2: style.