make strcuture more clear