Moving to floats & removed junk code