Help me improve my Build