NULL & refactor