simplify internals (better names)