little cleanup. still no tests tho :D