better formatting
$Id$ stuff