Change code style according to Henning's suggestion