- simplify a few things