Cleanup, formatting, few minor fixes, etc