[clean] cleanup code and comment