revert few changes from codestyle commit