Cleanup based on @necolas feedback