Made some sections of code less bloated