codestyle cleanup