rethink structures for better logs