Cleanup & update to v1.00