Cleaned up POD a bit again