[task] cleanup code and comments