Remove [const unit], and refactoring