Edit some bad smell class