Little refactor. Many to do.