Code tweaks
Split complexity of buildTask