Poor cleanup

I started to try and make it cleaner but meh