Clean by extracting methods