cleaned up the structure