* address minor coding style requests