Cleaner instantiation, fixes