Code cleanup; demo styling