Cleaned code up - More changes coming soon.