Core: Clean and uniformize visitors