minor: clean up structure