Rename vars and change Point to float