Style fixes, better split()