Code cleanup
More POD
Changed to internal method