Some bad spacings and leftover functions forgot to delete.