Code cleanup/commenting