remove silly code & refractoring