Cleanup, compacting and optimization part.3.3 COM_*Buffer