Slight refactor, getting rid of unused code.