Some initial cleanup/teaking.