Refactoring, proper POSTs