better function name
avoid warning
effing eclipse
fix code width