bug 1391: Codestyle cleanup