Code cleanup and a few additional comments