fixed the massive amount of lines the declarations took up