Tweaks
Removed null