Cleanup visibility, final newlines, and CONST