rationalized structure a bit