- Removed usage of 'not_empty' variable modifier