Some cleanups
Manually split lines by spaces