remove extra code, clean code