small refactor with new buildfile todo