Tweak

Overall cleanup of the code.