Internal: more code cleanup
Internal: more code cleanup