style enhancement and reorganisation