Cleanup & README updates