a little cleanup, this is still just a non-functional skeleton