removed redundant struct