Clean up
First pass at conversion