[Comments]: bugfix & cosmetics