Cleaned Up Functions More

Cleaned the code up a little more, making it simpler.