further structify
small updates