Cleanup last bit of code not formatted by me in here