Minor code revisions