small cleanup

I left some mess while making last commit. Making code in sync with the
rest