some cleanup and changes

I just want to make Faceguy's life hell