remove unused variable, change string to number
align code