Refactor + comment code
Remove old code + start POST parameters encapsulation