Cleanup and focus on main implementation.