loader: clean code

Change-Id: Ica00a83f9d1e32a25b6ae440c0be5df4383c73e5