fixing falsy optimization
validation exception
add new line before return