Add default instances, clean code a bit