Misc Cleanup/tweaking