Merged 2 cases for minor better coding style.