Fixed lines over 80 and more cleanup