Refactor to remove some unecessary bits.