Clean up; readme updated