move float into its on file, also some cleanup