Only some code beautification. No functional changes.