Feel free to clean up my mess, but in a separate PR please ;-)