Removed redundant procedures.
Minor changes.
Minor changes, part two.