Updated float field and refactorization