Revert "few minor changes"

This reverts commit 3bde4e7f81aacaff12d9c281e8a8ef68d9660bae.