Code clean

Code cleanning and rearrenge