Clean-up & add styles