Less nulls

- Removed unnecessary nulls from the code base.