Have to fix EOF and empty lines