Cleaned up null pointers