ComponentInfoBuilder refactoring and commenting