Updating

Cleaning up the code, trying to make it short and sweet. Will do more
over the weekend
Cleaning up code