restructure, easier for human to read