Cleaned up some code. Removed some redundancy.