Code cleanup changes from Elvis.
Merge pull request #14 from ParaPhraseAGH/random_insid_skel

Code cleanup changes from Elvis.