Refactoring of handlePost #59 #60