Clean up helpers
Add post validation