Apply martin review comments