revert changes made by commit 802207b, some codding style improvements