Style tweak and testing