Clean up code due to the usage Delegates.notNull()