Code cleanup (global invocations are now consistent, removed extraneous comments)