Cleaned up & commented new code.