Minor refactor of methods to be filled in.