Cleaning up lines a bit