better names and clarity?