Fixed horrible code mess >:( Written on github gui