Changes based on jkeiser's review comments; mostly minor cleanup