Cleaned up POD and removed debug statements.