coding style, cleanup of 1ed2239