[all modules] cleanup & reformatting.