Clean up from review comments