minor cleanup in the code