Tidied, fixed POD issues.