design: make some changes suggested by skyronic