- Added TODO and removed unneccessary null check