code standardize and clean up

dont use spacebar to indent