Code Review tweaks