Minor changes.
Minor changes, removed unnecessary .astype use.