Cleaning things up a bit before the real impl