0.1.616

~ Refactored and cleaned up some code.