cosmetic stuff
minor stuff and some renaming
minor stuff and some renaming
logging build object