Cleaner code in Core, Void places implemented