epic2: cleaned up a couple things