Cleanup

It's automatic so there probably isn't any bugs
Small simplifications