refactored sorting / converting of build data