Clean up numpy imports and make uniform syntax