Line cleanup fix

And some minor changes