refactor and avoid warnings
1 file changed