Clean up, add POD, no functional changes