Did some cleanup of the code. Eliminated a TON of redundancy.