Cleanup. Add some interests (commented)