a small cleanup of structure and naming