Converted all instances of numpy to np (as per python standard usage)