Clean up

Less lines more fonts