Improve POD and comments