20140407 modify class and method header

20140407 modify class and method header
and move pseudo code