Removed `NOT NULL` condition, fixed code indention/flow