minor base cleanup