Reduced unnessary code