Altered documentation/commenting