ENH: Refactor unnecessary code (#12)