Empty line problem fix + parser cleaning