Make methods smaller and do one thing