Clean up. Improve completion