Adjust fields + refactor a bit