Cleanup

I wish this wouldn't merge like ass every time