Refator, move empty line detection at source
Refactor

Move empty lines detection at the source