Clean up style in reorganized modules