Added NULLs + some cleanup