Cleanup, fixed trailing endline problem