Fix Andrey's comments