Refactor structure a bit