fix POD
Code cleanup