fix whitespace, remove data directory