minor syntax cleanup with some review from daviddavis