Made File filepath private, clean up