Begin small cleanup. We still need to change all the names