Refactor structure to clean things up