Began cleanup/commenting