Reorganizing methods order.
JShing corrections applied.