cleanup and use customize for some stuff