bugfix (dependencies have to be loaded first); some formatting

Change-Id: I45f866d2211b3c02a081d6cd70ac66c3e6f66694