cleaning up, updating POD