Fixed comments by Vitaliy