Code & comment block cleanups