More code cleanups and added a few notes/comments