Refactor of the buffer check logic and better formatting of private variables in the result service