Refactor remove empty lines