comments
chain modules
remove redundant includes