Cleanup & docs update